Description

Takes a set of changes from #2041 that are applicable without doing the flake update, which reduces the amount of review that'll eventually be needed there a bit

Type of change

Please delete options that aren't relevant.

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)

How Has This Been Tested?

bazel test //..., update-module-hashes, etc

Checklist

• Updated documentation if needed
• Tests added/amended
• bazel test //... passes locally
• PR is contained in a single commit, using git amend see some docs

This change is